Merge branch 'bug_203_fix_wrong_networkstate'