update restHelper method
fix file names
Merge remote-tracking branch 'origin/master'