Merge pull request #2 from cdipaolo96/master

Update from source
Merge pull request #4 from JacksonKearl/JKBranch

Merge to master