Merge pull request #228 from FreifunkUFO/master