Merge pull request #153 from danmcp/master

Stop printing out long messages twice
Use verbose option