Fixing issue #2

I have updated the latest source code with suggested fix from issue #2.