Merging newest version to master