Issue 326

Fixes issue #326.

I sent in the CLA, but have not received approval confirmation yet.