do not allow too many arguments
fixed capitalisation
Merge pull request #1 from megakacktus/master

Additional validation