Merge branch 'hotfix/0.3.3'

* hotfix/0.3.3:
  @fix
@fix gera docs
Merge branch 'hotfix/0.3.4' into develop

* hotfix/0.3.4:
  @fix gera docs