Merge pull request #1 from bradbishop/master

Need rest server for upcoming delivery