another master commit
bug1 fixes on master