Merge pull request #1 from DommertTech/master

hmm...