Add transaction for em.remove
Merge remote-tracking branch 'origin/master'