Merge pull request #72 from Jailander/hydro-devel

new machine tag format
final and tested version of loader