issue #43 & issue #44 resolved.