Version1 Bug Fixed
merge changes