Splitted console
Merge remote-tracking branch 'erik/master'