Merge pull request #31 from corest/create_index

Extend template definition options