correction issu #5
issu #6
issu 7
fix ticket #8