Merge pull request #1 from shwarzes89/master

pull request