+ convert semicolumn to space
+ merge kolyuchii version
+ merge drKnoxy version
+ merge edrevo version
+ merge johnste version