Merge pull request #8 from miki9938/master

Merge pull request #6 from kebabkiller/master
Merge pull request #7 from kebabkiller/master

Merge pull request #8 from miki9938/master