refactoring
Merge branch 'hotfix/0.0.4'