Nice end state
Merge remote-tracking branch 'kotzi/master'