merge of new changes and tests added
old docs removed