Committing code from CI_2014