Merging Messagestarring branch with the up to date version