Merge pull request #1 from IanCaldwell/master

Ian_changes