henrykironde Merge pull request #252 from ethanwhite/paper