Fixes #25 Fixes #28