commit recent changes from @mgubi