Fixes #103; Fixes #102