Refactoring in getting data
Merge pull request #5 from Se7ge/develop

Refactoring in getting data