cheery picked calc MSD bug
jar updates with bug fixes by Arayoshi