New Morton Rubinskiy Merge

This is a merge of my changes and Igor's.