Fixed an issue and updated a little.
Merge branch 'master' into gh-pages