Fixes #26 Fixes #28