Issue #34: Added files missed on previous commit

Issue #34: Added files missed on previous commit