Merged from eclipse
Merge branch 'master' of https://github.com/fabiojmendes/ccn.git