More portable (part of a bigger possible change)
Merge pull request #6 from jjshoe/patch-2

More portable (part of a bigger possible change)