1.2

second commit