#10 Add services
Merge branch 'enhancement10' into 0.2.0-update