Merge pull request #1 from DrDavid/master

Getting changed from David