Args removed, small bug fixed.

Plus created complexed test.
If statements fixed, formating edit.
Merge pull request #4 from hleumas/remove-args

Args removed, small bug fixed.