Major update, including rewrite, unit-tests and more options. Version bump from 0.0.5 to 0.1.0