merge develop into BRIDGE in prep for release v1.0.2 (again, after additional changes on develop)

merge develop into BRIDGE in prep for release v1.0.2 (again, after additional changes on develop) #93