rebase code

brining code up to date and merging with base code
link incremental configuration

for some reason it was causing a compiling error modified the link
incremental from true to false. Now compiling.