Fixes #13
Fixes #19
Release v0.1.3