Merge pull request #1 from konfirm/master

Pull request to update fork
Merge pull request #5 from marcobalk/master

Merge pull request #1 from konfirm/master