Merge pull request #1 from valiknet18/master

pull