Merge pull request #7 from OPENNETWORKINGLAB/master

Merge with Master changes