Merge pull request #24 from miki9938/master

Merge pull request #14 from kebabkiller/master
Merge pull request #15 from kebabkiller/master

Merge pull request #24 from miki9938/master