Merge pull request #113 from ddumontatibm/master

Import changes with new project settings.