Merge pull request #7 from nwalk/feature

Feature
Merge pull request #9 from nwalk/feature

code cleanup
Merge pull request #10 from nwalk/feature

formatting inputs
Merge pull request #11 from nwalk/development

Development