Merge branch 'master' into dino
added error check for zero or one argument
Merge remote-tracking branch 'origin/dino'