Changes made for 7-30
8-3 changes
Changes 8-4
Changes 8-6
Final commit 8-7
Merge pull request #15 from pumpkincouture/8-4

8 4