Bug: #66
Merge pull request #69 from Soup4you2/master

Patch for issue, fix #66