Merge pull request #9 from finger75/master

Merge pull request #8 from finger75/hotfixes