I think this fixes #185 and #184
Merge pull request #187 from hotdogman/patch-11

I think this fixes #185 and #186