Bug fixes
Merge pull request #36 from 28msec/0.3.5

Bug fixes