Solved Issue #38