Solved Issue #34