Generated master for commit 4a00095
Merge: 62d8918 c020d8c
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Merge pull request #20 from CNERG/resolve_errors