merged idea into master
Merge branch 'CrazyIdea-Number_2'