Merge pull request #59 from devdame/import_data

Import data
Merge branch 'master' into import_data