Merge pull request #489 from ecsv/batmand-procd