Bug fix
Merge pull request #48 from 28msec/bugfixes

Bug fix