Hot fix
Merge branch 'hotfix/0.0.3'