Closes #3. Closes Asana Task #4313857731158
Merge branch 'issue-3'