new improvement on idea2
Merge remote-tracking branch 'origin/idea2' into idea2