Merge pull request #28 from azakus/master

Factor out target finding
Merge pull request #29 from azakus/master

Work around for missing ups