Added configurations for chi_c and fixed couple of potential leaks in code.
Merge branch 'master' of github.com:degano/usercode