Updated estimator
Merge branch 'master' of https://github.com/mapto/sprks
Fixes #37