Cleaner data loading
Fix memry leak (closes: gh-10)