Merge pull request #3 from pumpkincouture/9-20

Changes 9-20
Merge pull request #5 from pumpkincouture/9-18

Merge pull request #3 from pumpkincouture/9-20