Merge pull request #113 from tesselode/fix-multi-targets