Change structure, added specs
Merge pull request #3 from codernaation/refactor/change_super_method

Change structure, added specs