Merge pull request #131 from opennetworkinglab/devl/functionality

Devl/functionality