merge branch master
prevents multiple decimal points