Merge pull request #170 from jganseman/master

prepare for addition of thomas more (commented for now)