Fixes the invalid pointer problem
Merge pull request #7 from thiagodefreitas/indigo_new_structure

Fixes the invalid pointer problem