Merge pull request #43 from HSkogmo/master

Terrible Pull Request
meh