Merge pull request #347 from mhaskel/hiera_fix