Feature/trello 20