Generated master for commit 8527af9
Merge: f0feef1 b650e0a
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #35 from CNERG/mbmcgarry