fixed bugs
Merge pull request #23 from wchamilton/testFeatured

Good squashing!