Changes 9-21
Merge pull request #1 from pumpkincouture/9-21

Changes 9-21