Merge pull request #33 from fabrejc/develop

Fix of protocol handling (http/https)