Refactoring code
Merge branch 'release/1.0'