Merge pull request #18 from cristiroma/master

Refactored field_body
Merge pull request #19 from cristiroma/master

Refactored field in code