implement ML2 changes from alexei lugovoi
Merge pull request #18 from craiganderson/stable/havana

implement ML2 changes from alexei lugovoi