Merge pull request #12 from Jailander/hydro-devel

new env loader on machine tag
final and tested version of env-loader