Updates version
Merge master