Issue #30 is resolved and can be closed if everything is ok

Issue #30 is resolved and can be closed if everything is ok