finished getData method
Merge remote-tracking branch 'origin'