Card #237

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