Merge pull request #1 from xopherdeep/master

Merged From main repo