Fixed point calculating
Merge branch 'master' of https://github.com/DMOPC/site