Fixed #40
Merge branch 'master' of https://github.com/Zhinsta/Zhinsta