For my friend gonzalo
Merge pull request #11 from gonch/ch_Context

For my friend gonzalo