updated method signature in header file
merged with origin
fixed build errors