fix for #1 (Preferential strategy is not finishing calculations for a long period of time). I am afraid it aint going to be faster...
Merge remote-tracking branch 'internetz/master'