Fixing Issue 92
Merge pull request #93 from westfieldlabs/issue-92

Fixing Issue 92