Fixes #19
Fixes #28