should address both #22 and the linux issue with the fix for #23