Fix master
Merge pull request #87 from 28msec/fix-master

Fixes the regression caused by PR #12