Merge pull request #87 from Ragnar-F/v2

v2: Fix small issues
typo