Corrections by @valcris

Fixes #1