Merge pull request #2 from valiknet18/develop_branch

Merge pull request #1 from valiknet18/master