Merge pull request #25 from realraum/vlans