Generated master for commit 153e11e
Merge: 6c2e0b9 e09e73e
Author: gidden <matthew.gidden@gmail.com>

    Merge pull request #24 from rwcarlsen/cep17-rev3