Minor bugfixes
Merge branch 'develop' of https://github.com/Hoanoho/hoanoho into develop