fixed trello tickets #18 & #14