Merge pull request #1 from freifunk-gluon/master

update the fork from upstream