Merge branch corrections to master