Merge pull request #2 from benjaminparnell/master

Merged pull requests from original repo