Updated per comments pull #90.