changes for issue1
issue1 fixed completly
merged issue1