first commit
Merge pull request #20 from riveVermeulen/master

first commit