Closes #9
Merge pull request #10 from iambmelt/iss9

Closes #9