code merged and bugs resolved
code merged and bugs resolved