Merge pull request #128 from maartenvhb/caa