Update with new field types
Merge branch 'master' of git://github.com/dmitrizagidulin/nrj into insert_bug