gcc compatibility...
Merge branch 'developer' of https://github.com/nomacs/nomacs into developer