Fixes #20