Merge pull request #1 from zingbretsen/master

Make it a module + add data_dict creation
Merge pull request #3 from rystoli/master

Sync with upstream