Fixes #199
9 files changed