Merge pull request #1 from joverall22/master

kl
Merge pull request #14 from pchatterton/master

Merge pull request #1 from joverall22/master
Merge pull request #15 from eanplatter/master

Merge pull request #15 from joverall22/master
Merge pull request #16 from joverall22/master

k