update for linux
Merge branch 'develop'