Merge pull request #5 from Urban82/master

Fixed regression in version 0.6