Some work on collision detection
Fixed a bug
Put compiler options C++11 by default
Merge pull request #2 from kiroxas/develop

Develop