Issues 53

Pull request #53 after modification