Fix for Behaviour

=)
Merge branch 'master' of https://github.com/ilteoood/Viope2014