Merge pull request #13 from jcmcreate/dev

Dev to Master
Merge pull request #14 from jcmcreate/master

Merge pull request #13 from jcmcreate/dev