merge with branch 1 + new version