first commit
Merge pull request #11 from ChriHg/master

first commit