Major changes. tested and worked :)
Merge branch 'release/v0.1'