Merge pull request #20 from theGrue/master

Prevent blank fields from being written when specifying a layout.