Fix some issues.
Merge branch 'master' of https://github.com/republikanac/zeto