Merging test with master

After the deadline this version is the release version