Merge pull request #6 from OPENNETWORKINGLAB/master

Merge from trunk into clone