linux changes
Merge pull request #146 from Align/matt-dev

linux changes