Added support for customizing behavior
Added missing parenthesis
resolve conflict
Merge branch 'Lucretiel-patch-1'