Few changes
Merge pull request #16 from mcepeda/uct2015Core

Few changes