Upstream improvements - r0.1.15

- Fixes #10