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

Refactored field in code