minor correction
minor changes
merging