Merge pull request #1 from gaboom/master

My pull request