Close #41

Changed formula