Merge pull request #23 from bhewett/master

Make revision 1.7.17