Issue #44 fixed
Issue #45 fixed
Issue #46 fixed