Fixes #8 and #9