Merge pull request #117 from Jailander/hydro-devel

Latest Versions of machine tags
final and tested version of loader