- included changes from buildservice
Merge pull request #96 from aschnell/master

- included changes from buildservice