Merge pull request #6 from Andreis13/master

Fix problems after merge conflicts
Refactor field class