Fixes #75

Need more tests on others OS's.