Merge pull request #13 from jcmcreate/dev

Dev to Master