Fixes #2 and #3
Fixes #25