hard development...
Merge pull request #3 from scippio/master

hard development...