Added a man page and changed behavior slightly