Merge pull request #1 from harlo/new_setup

merging everything
batch model fix
Merge branch 'master' of github.com:harlo/UnveillanceAnnex into new_setup