Merge pull request #69 from savil/gen-target-fix