Fixes danielgrosvenor/me#3 #4

Closed danielgrosvenor closed 4 years ago