Merge pull request #479 from mhaskel/update_anchors