R7_US02_General Bug fixing
Adding docstring and fixed some return type