Updated the documentation to match the latest functionality
Merge remote-tracking branch 'origin/master'