Merge pull request #11 from bjames105/master

Merging