Merge pull request #6 from dockiler/master

Merge pull request #5 from dockiler/REST
Merge pull request #7 from dockiler/REST

Merge pull request #6 from dockiler/master