Merging
Merge pull request #15 from nbellowe/master

Merging