Exprimental version 1.2
Fixed that and the merge.