Merge pull request #1 from klabe/strait

Merge in Matt's changes
Merge pull request #2 from klabe/strait

Merge CAEN fixes
Merge branch 'master' of https://github.com/klabe/chopper into strait