Merged Doc changes from v1.0