tweaks towards getting a clean compile on both Linux and Darwin
Merge pull request #1 from kindlmann/master

tweaks towards getting a clean compile on both Linux and Darwin