fixed some typos? added some return values and renamed the file
Merge remote-tracking branch 'origin/master'