UnitTest for Issue #18
Bugfix issue #25 , issue #26
Bugfix for issue #18