Merge pull request #26 from claudius108/master

Improved the building process