Removed args variable and changed design
Merge pull request #5 from taykey/design_changes

Removed args variable and changed design