fixed price computation
Merge branch 'master' of github.com:schneith/caffeine