Small bugfix
some fixed
other hotfix
Merge branch 'develop'

* develop:
  other hotfix