merged changes in build service
Merge pull request #1 from tgoettlicher/master

merged changes from build service