frankmcsherry Merge pull request #111 from frankmcsherry/dataplane …