Refactoring
Merge branch 'hotfix/Issue#27' into develop
Progress Issue#26
Merge branch 'feature/Issue#26' into develop
Progress Issue#26
Merge branch 'release/v0.71'