first version
Merge pull request #8 from mulligen/master

first version