Fixes #20
For #14