merged in 1.3 code (I had made my changes to 1.2)