Issue fixed [#21]