Fix #147
Merge branch 'stable-19' of https://github.com/luiges90/ZhongHuaSanGuoZhi into stable-19