8-11
Updated tests
Merge pull request #17 from pumpkincouture/8-12

8 12