Version 0.11.1: Fixes #16 Fixes #15