fixed error found by Lloyd
Merge branch 'master' into gh-pages