Card #96

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