WIP
Merge branch 'master' into updateDeleteField
Add feature rename/delete fields -- Fix #1