antonhornquist Merge pull request #2 from dndrks/master