Neccessary amend to pull #96 - still throws exceptions in some cases
Merge pull request #105 from jayunit100/master

Neccessary amend to pull #96 - still throws exceptions in some cases