Fixes #7
Fixes #27