Fixes #12 and #13.