Compilation fix.
Compilation fixes.
Merge branch 'master' into hernando
Merge pull request #193 from hernando/master

Compilation fixes