Merge pull request #3 from Wohlhabend-Networks/Luigifan-master

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

Merge pull request #3 from Wohlhabend-Networks/Luigifan-master