Issue #342 resolving conflicts with master && adding delete button