Fix issue #36 and #35.
Merge pull request #41 from mandel-macaque/add-person-info

Fix issue #36 and #35.