restapi code refactoring
Merge pull request #18 from LSIR/restapi

restapi code refactoring