Merge pull request #328 from wigyori/for-15.05-batmand2