Patch 1

Had issues forking from HEAD of v2.1.0, so have put in my recent updates as separate edits.