release version of ccfc28dd0e7ed6672e3619b73ae5b951d17e7ea5, with input support from inanity