Merge branch 'idea-2' into idea-1
idea 1 and idea 2
Merge branch 'idea-1' into idea-2
Merge branch 'idea-2'

Conflicts:
	readme.txt