This commit fixes #10