fixed error
Merge commit 'e775b15' into gh-pages