Merge pull request #7 from eanplatter/master

Merge pull request #6 from joverall22/master
Merge pull request #7 from joverall22/master

Merge pull request #7 from eanplatter/master