Fixes #11 and #12