Merge branch 'dev' of github.com:otknoy/michishiki into dev
Merge branch 'master' into dev