code cleaning
fix compilation under x86_64
Merge branch 'devel'