Minor bugfixed
Merge branch 'master' into gh-pages
Minor bugfixed