Putted some notes on the code to enlight the changes needed for 1.9 API changes
Merge branch 'testes'