Merge local develop into group develop

Working on Features #97 and #98, as well as Bug #96 and Support #70.