Fixes #23 Fixes #20