Build simplifications
Merge pull request #7 from jaceklaskowski/build-simplifications

Build simplifications