20140619修改原因部分
Merge branch 'dev' into gh-pages