Merging latest-version into master

I think this is ready to be merged into master