Changed ApiService implementation
Merge pull request #79 from maxirosson/dev

Changed ApiService implementation