Pull request regarding issue #35

Hi,

I have a probable fix for issue #35