potential solution to issue #74
Merge pull request #75 from laverboy/patch-1

potential solution to issue #74