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