One more fix and one more feature.

Hi again. Sending you one more bug fix and one more feature. :)