Iss53 is resolved

done
Merge branch 'iss53'