(master) Added some changes back that got dropped during README merge
Merge pull request #807 from cormacmccarthy/master

(master) Added some changes back that got dropped during README merge