merging changes from toolshed repository
def name changed