Kam

REST work merge to OryxProject:master
This guy needs a copyright header