WIP: build
Merge pull request #1 from pmorie/build

WIP: build