FIX: Bug in CAE, H-CAE costs, unit test added
Merge pull request #231 from memimo/cae_bug

FIX: Bug in CAE, H-CAE costs, unit test added