initial
lectors reorder
lectors removed
some optimizations
some optimizations
Merge remote-tracking branch 'origin/master'