Minor fixes

Minor fixes on statics virtuals functions
Merge branch 'master' of https://github.com/Niverton/SpaceZ