modify slightly for the template
Merge branch 'master' of https://github.com/jicui/jicui.github.com