Issue #100 and Issue #102 fixed