Merge pull request #1 from solomonyan/master

merge