Issue #17

Pull request for the issue #17.