Latest changes for linux
Merge pull request #1 from aberaza/linux

Latest changes for linux