Merge pull request #3 from MauriceMohlek/master

Merge
Merge pull request #2 from KoKuToru/master

Merge pull request #3 from MauriceMohlek/master