Solved Issue #52
Issue #51