Merge pull request #1 from cbcunc/master

First volley back from RENCI.