Updated to the 1.0 version

Updated to the 1.0 version from the develop branch.