Merge pull request #3 from timpx/master

Update
Merge pull request #18 from pausz/master

Merge pull request #3 from timpx/master