Kam

REST work merge to OryxProject:master
The indents don't match -- 2 space indent was the convention I'm using