adding changes for #52 in the source files