Improved code structure
Merge pull request #22 from rampo/asynctask

Improved code structure