improve gcc compatability
improve gcc compatability
Merge branch 'master' of https://github.com/eranpeer/projects