merge
Merge branch 'dev' of https://github.com/k801030/wish into dev