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