added minor changes
merge