20140917:修复示例代码中的错误
Merge branch 'dev' into gh-pages