Fix #516
Merge pull request #1118 from charlycoste/fix-516

FOUND 2 ERROR(S) AND 24 WARNING(S) AFFECTING 25 LINE(S)