CZ Changes
Merge pull request #86 from ktollinger/master

CZ Changes