Fixes #1
Fixes #3