Merge pull request #1 from chocola/chocola

Chocola
Merge pull request #2 from chocola/master

merge my last changes please
applicaiton update