Merge pull request #6 from finger75/master

v3.0
Merge pull request #8 from finger75/hotfixes

v3.0