Fixes #5 and bumped to 2.0.7