Solved Issue #28