Merge pull request #82 from endophage/flynnmaster

simpler NormalizeTargets