Merge pull request #8 from arago/master

merge
fixes
Merge pull request #9 from arago/master

merge
Merge pull request #37 from p1tz/master

merge