FINAL PUSH
Merge branch 'dev' of https://github.com/chipmunkio/Chipmunk into DEV2