update at 2014-01-13
Merge branch 'master' of https://github.com/laowang24/laowang24.github.com