haifun/code-guide — pull request #1 by haifun (2014-07-11 04:35:13+00:00)
Title: merge materliu branch

merge materliu branch