Code changes to fix git issues #44 #47 #48