Merge pull request #29 from tokejepsen/update1.2

Update1.2
Merge remote-tracking branch 'upstream/update1.2' into update1.2