Merge pull request #82 from Tincer/master

It works :D