Merge pull request #11 from nwalk/development

Development
Revert "Development"
Merge pull request #12 from nwalk/revert-11-development

Revert "Development"
Merge pull request #13 from nwalk/feature

Feature