fixed empty field handling
Merge pull request #6 from dotch/master

fixed empty field handling