Slight modification
Merge pull request #240 from dreamteam69/master

Slight modification