* Adjustments
Merge branch 'master' of https://github.com/sebafonte/capi-problem