Added: Services command and macros
Merge branch 'develop'