working version
Merge github.com:FreiMarkt/rest_services