Closes #16
Merge pull request #17 from dwrjones87/development

Closes #16