Released version 1.6, with contributions from @grue