Merged changes with docs