added service time support
Merge branch 'master' of https://github.com/neerbee/neerbee