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