Code adapt to issue #31 and #2