refactored build process, #fixes #10
Merge branch '7.x-1.x-dev' into 7.x-1.x