Separate function
Merge pull request #347 from dreamteam69/master

Separate function