Fixes #4 and #6