modifications to support Linux compilation
Merge pull request #35 from jpsutton/master

modifications to support Linux compilation