Merge pull request #1 from The-Dream-Team/master

Merge pull request #341 from dreamteam69/master
Merge pull request #342 from dreamteam69/master

Pull a pull?