Closes #11
Merge pull request #16 from iambmelt/iss11

Closes #11