Merge pull request #13 from p1tz/master

update
Merge pull request #14 from p1tz/master

update
fix some errors
Merge pull request #4 from viteke/master

merge