Further fixes
Merge branch 'friends' of ssh://github.com/mikedussan/Muneris into friends
Add other services through-out
Merge branch 'friends' of ssh://github.com/mikedussan/Muneris into friends