Revert commit from issue #58, fix issue #63
Version bump (2.4.4)
Version bump (2.4.4)