Merge pull request #1 from Widdershin/master

Master