Fixes for Linux version.
Merge branch 'refs/heads/Release_1.0.0'