Merge pull request #1 from Widdershin/master

Master
Merge pull request #2 from Widdershin/develop

Merge pull request #1 from Widdershin/master