Merge pull request #36 from JeppeTh/master

Minor adjustements