Merge pull request #17 from cristiroma/master

Refactored field_threats
Merge pull request #18 from cristiroma/master

Refactored field in code