minor bug fixes
Merge remote-tracking branch 'origin/Development' into gh-pages