Services, some commands are roughly implemented
Merge remote-tracking branch 'origin/master'