Add dropping
Merge branch 'master' of https://github.com/firefly431/CSMP1