better cap check
Tested up to 4.0
Version bump and changelog