Merge pull request #9 from Gummibeer/master

v1.0 stable