Third attempt, fixed problem with int and str concatenation
Merge branch 'develop' [ci skip]