Merge pull request #8 from OPENNETWORKINGLAB/master

Merge from trunk