Increased version

Increased version bicause of the merge.