Initial file commit

Initial file commit
Merge pull request #1 from mfunk/master

Initial file commit