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