Initial commit for Issue #143 and #144