Solved Issue #44