Master-Rubinskiy-Morton

Hi all,

Here is the rebased Rubinskiy code.