Even more goddamn fixes.
Merge pull request #9 from emilsedgh/master

Pf.