Closes #6
Merge pull request #12 from iambmelt/iss6

Closes #6