Attempt to fix issue #90
Merge pull request #154 from HakanSiktas/master

Attempt to fix issue #90