Updates
Merge branches '1.0.0.00' and 'master'