Merge pull request #3 from gabi2/master

simplify code concerning vlan=0