Refactory REST
Merge pull request #164 from Ashrey/dev

Refactory REST