applied a modified patch from Christian Grobmeier add and delete support https://issues.apache.org/jira/browse/SANDBOX-183