many changes...
Merge pull request #6 from scippio/master

many changes...