Issue #27 and Issue #28 resolved.