Merge branch 'release/0.1.0'
Refactoring and adding new features