Fixing issue #100. Will be in v1.0.0-rc2.