addresses #44
addresses #44, #52