Merge pull request #39 from adoulrac/rachid/integration_release1

Rachid/integration release1
Avoid exception when modifying listview