Level 3 and other changes
Merge remote-tracking branch 'kotzi/master'