Merge pull request #4 from viteke/master

merge
Merge pull request #15 from p1tz/master

update