Merge pull request #3 from CliffordAnderson/master

updating master aug 1
Merge pull request #51 from ZoraBreeding/master

Merge pull request #3 from CliffordAnderson/master