version 16042014: a lot of bugs fixed!
Merge branch 'master' of https://github.com/larryPersonal/Nanhua