Merge pull request #34 from CPqD/master

Changes to the OpenFlow 1.2 match framework