Merge pull request #11 from purple-martins-2013/chore-features

Chore features