refactored A LOT. Seriously, this is a big deal.
merged with master
Merge pull request #26 from matthieuHanne/RefactoringBehaviours

Refactoring behaviours