Merge pull request #7 from JeppeTh/master

Jeppeth