Fixes #9
Fixes #28