Fix behavior in accordance to man page

The last attempt wasn't quite right, this is more inline with the intended behavior according to the man page.  The only real fix needed was changes to main.c.

Sponsored by: Groupon, Inc.