fix for part 2 of #141 as noted by @pattentrick
Merge pull request #143 from collinhover/dev

fix for part 2 of #141 as noted by @pattentrick