Merge pull request #9 from pmorie/build

Build
Fix incremental extended build