bug fix
Merge branch 'development' of github.com:cassiuschen/mo into development