Sw5

Continuation of https://github.com/shrinkwrap/resolver/pull/63 after failed git-fu.