Fixes #2
Merge branch 'master' of https://github.com/yoavi2/Madgim.git
Merge branch 'master' of https://github.com/yoavi2/Madgim.git
Merge branch 'master' of https://github.com/yoavi2/Madgim.git
Fix problem when the network in inactive
Merge branch 'master' of https://github.com/yoavi2/Madgim.git