Merge pull request #1 from goshazvir/goshazvir

Goshazvir
Merge pull request #2 from goshazvir/master

Merge pull request #1 from goshazvir/goshazvir