Add quiet mode support
Resolving merge conflict for #4