Refactor.
Merge branch 'master' of github.com:/frostwire/frostwire-jlibtorrent