This commit fixes #30