Add batch, fix #9