Manual Merge

This is a manual merge of #26

Closes #26
Merge pull request #28 from danielcsims/master

Manual Merge