Merge  from TopLittlebob/master

update project config