4.1-linux-build changes.
Merge pull request #18 from jkho/4.1-linux-build

4.1-linux-build changes.