Added getData method
Merge branch 'getData' into develop