Fix issue
Merge pull request #172 from dreamteam69/master

Fix issue