Merge pull request #7 from pmorie/build

Build
Merge pull request #8 from pmorie/build

WIP: incremental and extended build
Cleanup