Place substring outside of the incubator
Merge pull request #573 from nukiFW/master

Place substring outside of the incubator