version 27052014: some new updates!
merge
merge
Merge branch 'master' of https://github.com/larryPersonal/Nanhua