cleaned code and updated cmake
Merge branch 'master' of https://github.com/jfnavarro/PrimeTV2
cleaned code and updated cmake