Merge pull request #37 from axsh/remove-download-phase-dependency

Remove download phase dependency
fix expanding variable.