Updated changelog to reflect fixing issue 130
Updated per peer review to simplify logic