Fixes #20

Stable Version 0.10.3