Bug fixes
Merge branch 'master' of https://github.com/basdag/service
Bug fixes & Update style