Added decimal support, Fixed equation element