Fixes #17 Fixes #18