Merge pull request #1 from pkeulers/feature/planservice

Feature/planservice