Fix issue #24 en #25
Fix issue #24 en #25
Fix issue #24 en #25