Merge pull request #1 from hydra/master

nix