Fixed' #24, format and using math package