Bug fix v0.2
Resolved merge conflicts
added all features