Feature/trello 17