Added missing classes
Merge pull request #1 from ojwanganto/Release_1

Added missing classes