Changes 9-27
Merge pull request #7 from pumpkincouture/9-27

Changes 9-27