Fixes issue 246
Merge pull request #248 from dustin10/fix-246

Fixes issue 246