sferik had the wrong key
Merge pull request #84 from vertis/master

Merge myself