add from soda branch
Merge branch '20141215_bySoda' of https://github.com/soda-wy/LearnOC