fixes #8

Changes are listed/explained in #8.