Fixes #115, Fixes #118