Added batch
Merge branch 'dev'