Refactored super method, chenged structure
Merge pull request #2 from codernaation/refactor/change_super_method

Refactored super method, changed structure