Fixes #42
Stable Version 1.0.0-beta.2