calc: tweak
Merge branch 'master' of https://github.com/indika/functional
fib: fibs2