Issue #11 fixed.