patch with latest modifications from alejandro <=> initial submitted version
Trivial Merge branch 'master' of github.com:Agyar/cs_catalyst_chapter