Fix issue 653 (#669)

* fix-issue-653: first past of the fix, script are provided and test for internet, thsy shoud be tested from local area network.

* fix issue #653 some bug fixing. Still need some tweak for local area connection.

* fix issue #653: some adjustments according comments