Merge pull request #55 from cconrads-scicomp/master