Fixes #23
Fixes #26

Stable Version 1.0.0-alpha.5-7.