Attempt another fix
Merge pull request #166 from dreamteam69/master

Attempt another fix