fixed Issue #96
fixed Issue #96
Merge pull request #97 from topiaruss/master

Fix issue 96