Codereview comments
Merge branch 'trello'