Avoid polymorphism whenever possible: added todo to remind removing overloaded methods
Merge branch 'future' of github.com:/wallix/redemption into future