Cap 4 ddp
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork