Structuring data capture
Merge pull request #2 from andregoiano/development

Structuring data capture