Issue #34 fixed.
Issue #41 fixed.