Merge pull request #1 from cfriedrich/New-Build

New build
Merge pull request #2 from cfriedrich/master

Merge pull request #1 from cfriedrich/New-Build