Merge pull request #41 from p1tz/master

merged
Merge pull request #23 from arago/master

sync