Updated code
Updated documentation