Merge pull request #5 from vad710/master

Fixing issue #4