Generated master for commit cbc1997
Author: gidden <matthew.gidden@gmail.com>

    some revisions for cep18, should be ready for review