Issue #8 I believe is fixed by this commit