Merge pull request #1 from shwarzes89/master

pull request
Merge pull request #1 from xogus1121/master

Merge pull request #1 from shwarzes89/master