Fixes #6 and #9