First attempt to fix #223
Fix for issue #225
Merge pull request #226 from aesedepece/fix-for-issue-225

Fix for issue 225
Merge pull request #224 from aesedepece/fix-for-issue-223

Fix for issue 223