version 31042014: a lot of bugs and features solved!
Merge branch 'master' of https://github.com/larryPersonal/Nanhua