Feature 85

pull request for feature #85