Merge pull request #1 from prisyazhnuy/develop

Finish