Merge branch 'idea-1'

Conflicts:
readme.txt