bug fix #23 #24 #25
Merge branch 'hotfix'

* hotfix:
  bug fix #23 #24 #25