[Yuqing] #3
Merge branch 'master' of https://github.com/tinnolove/tinnolove.github.com