Compile ok
Merge pull request #652 from kerautret/CompileIssue651

Compile ok