Add comments to avoid misunderstandings
Merge branch 'dev'