Issue #5: The updates that remove fields are now handled properly
Merge branch 'issue#5' into develop