Fixes #7
Fixes #5
Closes #6