Merge pull request #41 from yol0swag/patch-7