Remerge

Remerged version 1.2