Fix of HELIO parse (and include the timeout)
Merge remote-tracking branch 'upstream/0.5' into 05helio
Merge pull request #1158 from dpshelio/0.5helio

Fix of HELIO parse