added comments
changed class path
merge fixed