Card #68

https://trello.com/c/8bcGJ0tr
Merge remote-tracking branch 'origin/master'