Fixes #2 (https://trello.com/c/v7wqYf67)
Fixes #1