Enhancement 234

Pull request for testing #234 implementation.