This commit fixes #11