Updated version

Updated version. Few things need to be fixed. Formulas implemented.