format files
correct method name
Merge from master