Merge pull request #1 from garykl/master

Field is not a list anymore.