Merge pull request #452 from Hyllegaard/master

Fix a few mistakes