Refactored field in code
Merge pull request #20 from cristiroma/master

Refactored field in code