tried to step lower number of dependencies
Merge branch 'branch-2-05' of github.com:percolator/percolator into branch-2-05