Merge pull request #3 from potchie0o8/master

Merge pull request #12 from reinsmeister/master
Merge pull request #15 from reinsmeister/master

Merge pull request #3 from potchie0o8/master