Fixes & improvements.
Fixes & improvements.
Merge remote-tracking branch 'origin/master' into back-end-working