Bolton

Results 2 issues of Bolton

Everything is explained in the trello bug report -> https://trello.com/c/nHp1zoIT