Changes going into version 1.5