More updates

Sorry, I couldn't figure out a way to merge all the changes in to one pull request when editing from the github web app.
Merge pull request #6 from eamonnmag/patch-2

More updates for 1.7.1