Sync with latest changes in RESTAS.
Merge pull request #1 from archimag/master

Sync with latest changes in RESTAS