Fixed inconsistencies around subnet vs vlan setting.
Merge pull request #121 from maksimov/develop

Fixed inconsistencies around subnet vs vlan setting.