Changed Argument Checking

Now CodeGuard is used.

Fix #23