Merge pull request #3 from pumpkincouture/9-20

Changes 9-20