merged pull request #18 into develop
Merge pull request #19 from SlavD/develop

merged pull request #18 into develop