fix bugs
Merge branch 'develop' of github.com:chineking/cola into develop

fix bugs