Remade the broken classes
Merge pull request #4 from Tdornak/master

Remade the broken classes