Merge pull request #24 from chives/dev

Services and parameters renamed
Updated dependencies