Merge pull request #116 from wpaulino/anchors