Problem with DIST project
Merge branch 'hotfix/0.1.0-002'