Merge pull request #6 from Luigifan/master

Merge pull request #4 from Wohlhabend-Networks/master
Merge pull request #5 from Wohlhabend-Networks/master

Merge pull request #6 from Luigifan/master