Committing
Merge pull request #1 from whelgeson/master

Committing