Merge pull request #4 from Wohlhabend-Networks/master

Merge