Code cleaning.
Merge branch 'issue-3' into develop