restws-331
restws-332
restws-332
Merge pull request #10 from surangak/restws-ticket-332

Restws ticket 332