these are features
Merge pull request #1 from onlyjsmith/develop

these are features