Confirmed Issue #48 with a unittest.
::valid is corrected, but ::next is still behaving incorrectly.

Issue #48
Fix for Issue #48.
Merge branch '2.1'
Updated changelog