Issue #34: Added files missed on previous commit