Feature 1234

I am submitting this pull request. Please review and make sure it is good to go.

thanks!

http://jira.arizona.edu/browse/KCI-1097