20140618修复笔误
Merge branch 'dev' into gh-pages