Merge pull request #18 from slandelle/master

Various optimizations
forgot to merge
Now boon wins in every category.