Merge branch 'feature/rest_client' into 'master'

Feature/rest client

See merge request !2