Merge pull request #190 from derfcat/master

Fixed entity-fields issue #157