Plugin pull request

Pull request for issue #27.