Updated documentation from master