Merge pull request #1 from stoneflower0/master

Mel has made changes