Merge pull request #1 from jpwrobinson/master

what do you think?
more comments
Fixed conflict
Fixed complicated conflict
Preprint opinion
new commit test