Merge pull request #1 from Therzok/master

Argument usage
*Fixing up exception.