initial commit
Merge pull request #1 from Hamms/master

initial commit