Some changesa and additions.
Merge branch 'master' of https://github.com/deavmi/DraggableDuck.git