Merged all the changes from develop branch to v1.0 and getting ready for the release.