fixes #99 fixes #100