very useful changes

OK, so this is how I submit a pull request....