solve issue #14
Merge branch 'master' into gh-pages
build 201308118-11h19