Merge pull request #1 from Tranz5/master