Add silent-option for some mappings
Merge branch 'master' into mac