probably last commit

some comments added.
Merge branch 'master' of https://github.com/ecntrk/Haixiu