Merge pull request #2 from opennetworkinglab/master