Merging v1.0 branch with master branch

Merging content of v1.0 branch into master branch