Fixed
Merge branch 'hotfix/v.0.0.2-fixed'