fix conflict
fix conflicts
typo affecting apply to group
make algorithms instructions actually describe the algorithms
add more parameters to algorithm. Not quite working, for some reason traits parameters are not changing on selection
Merge remote-tracking branch 'origin/master' into enh/add-parameters
bugfixes
Merge pull request #52 from twdb/enh/real-algorithm

WIP: Add real algorithm