fixed issue with fields and ordering
Merge branch 'master' of github.com:neuman/orchid