Additional code to Fix #222
Merge pull request #3 from mtoma/fix-issue-222

Additional code to Fix #222