Bugfixing Rest API
Merge branch 'iss-18-rest-api'