Added dict based meta generation
Merge pull request #464 from cccaballero/master

Added dict based meta generation