Fixes #7 and #16