Merge pull request #25 from cristiroma/master

Refactored field_body and field_threats
Merge pull request #26 from cristiroma/master

Refactored field in code