Maybe @maxpeterson wants to add his 1.0.1 changes here!