Merge pull request #34 from eanplatter/master

Deployed
Merge pull request #32 from joverall22/master

Merge pull request #34 from eanplatter/master