Fixes #5 - Less Fragile Failue
Merge pull request #6 from kristopolous/bug-005

Fixes #5 - Less Fragile Failue