Merge pull request #261 from ecsv/batmand-git