Add appropriate changes to be able to target Grimoire
Merge pull request #10 from arrdem/master

Add appropriate changes to be able to target Grimoire