Merge branch 'correct-apcer-calculation' into 'master'

Correct apcer calculation

Closes #31

See merge request !60
3 jobs for master in 12 minutes and 22 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  Build
passed #165384
docker
build_linux_36

00:08:30

passed #165385
macosx
build_macosx_36

00:09:23

 
  Deploy
passed #165386
docker
deploy_beta

00:02:58