Merge pull request #472 from yogo1212/batmand_whitespace