Merge Ash/13w44 fixes into  13w44-fixes main branch

this branch contains fixes for Issue #44 , #46 , #43