Improved building process
Merge pull request #2 from ErikSchierboom/build-improvement

Improved building process