Merge pull request #1 from danholevoet/master

Initial commit