Fixes #15