Updated manual and user guide