Generated master for commit 6253711
Merge: be8389a 23cdc99
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #13 from CNERG/resolve_errors