Change TODO position
Merge branch 'future' of github.com:wallix/redemption into future