Merge branch 'hotfix-v0.1.2'
Merge branch 'master' of github.com:larryyueli/okshell into develop