Merge pull request #8 from finger75/hotfixes

v3.0