Version 0.0.6

Mainly refactoring and support for several new options