Fixes #34。v0.7.12