Refactor load_data
Merge pull request #1 from djuretic/master

Refactored load_data