Refactor field class
Merge pull request #7 from Andreis13/master

Refactor field class