Can remove fields or keep them even though they are blank. Closes #240
Merge remote-tracking branch 'origin/development' into development