Fix #14 and #26
Fix typo.
Merge branch 'master' of https://github.com/ChandraCXC/iris-aandc-paper