Fixed infinite loop behavior, with spec, and updated CHANGELOG