updated dev-test branch
updated yet again
Updated merged docs