Fixes #20, Fixes #21