merging from the master repo

merging changes from the deliverable