Fixes #23
Fixes #2