Fix compilation issue.
Merge branch 'issue-12' into develop