Bug fixes
Merge remote-tracking branch 'origin/development' into gh-pages