#81: Context for person
Merge branch 'bug/81'