removed portable def
Merge branch 'develop'
Merge pull request #1 from thomas-barthelemy/develop

Develop