fix #13, #14, closes #15
Release v0.11.2