Merge pull request #175 from s0undt3ch/develop

Set the grains file in the proper place if found
Update change log