readme updated
Merge remote-tracking branch 'origin/master' into waterwheelDisp

Several Conflicts