Version bump and house-keeping
Script improvements