Issue #32 fixed. Also issue #16 fixed fully as planned.