v1.2
Merge branch 'master' of https://github.com/will-tang/will-tang.github.com