Curl cloud files retouch

Moving PR #330 to dev branch