update project to make it work from scratch
merge from master