Improve services
Merge branch 'master' of github.com:albinodervall/RTS