ADD: console options
Merge remote-tracking branch 'origin/master'
ADD: fix warnings