Pull a pull?

Merge pull request #341 from dreamteam69/master