Card #142

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