Fixing class
Merge pull request #14 from alxdarksage/develop

Fixing class