fixing issue #104
Merge pull request #118 from MrWooJ/fixing-Issue#104

fixing issue #104