made some unnecessary changes to parseService
Merge remote-tracking branch 'origin/master'